Move some functionality to schemaBase