Major refactoring of configuration, in order to add (and use) schedule plans