Adding config settings and new class structure