Simplify move management