Added schemas, removed duplicates