Adding initial stuff for the new config parts