Update Point class, remove override class