Fix breakage introduced by previous commits
Use rewritten config class to load config