Add feature Move + fix model