RC-3

Updated the config system