Add missing validation checks