Added move validation