Move checking to schema