new config implementation
2 files changed