Added schemas and types