Fix cyclical dependencies concerning configuration, split logic