Updated Move class