WIP Replace statics with Config API