added address and location to entity type, set first type to 0.