Started overhauling configuration model