Add entity types, small fixes