adaptions in entities; added ApiEntities