Enable SDD move in more places