moved xy-handle to Entity class