worked on entity management