Moved config functions to a separate module