CAPX-84 | Refactored the CFEntity to remove any bundle type specific methods to their php class counterparts