Move remaining validation into the validation section