[Enitity Manager] Added todos.