Generified the Schema system