Reworked the config/parsing class