More on entity model