Header fixes + configuration setup using class