Refactored support for move variations