adding majority of methods back to cpentitymanager