Updates for validation hooks