Added support for CAP, PRF and CPF markers