refactor: simplification of the schema related classes.