Changed how some of the configuration settings are, updated to 2.0