Converted Entity to new moving system