Added additional functions to transform entities into maps.
Began removal of hector libs in order to use only CP entities.