Changed Move types ("enums") to be final