Added Config Handler, needs fixing