Reworked config class a bit