Started to integrate the new configuration system (still WIP/dirty)