Reduce the number of problems in schema-service