remake most core entities private