Added placeholder class
Merge remote-tracking branch 'origin/efcp' into efcp