refine core entity model, pack it together.