Refactoring schema + configuration file