Moved configuration information to the appropriate section