Revise MovableEntity so it is abstract