Updated config class, should be more dynamic now