Add AddEntity and RemoveEntity methods