Added indicators for PTB and EPTB
Removal of un used report objects that needs builders
Added CQI indicators