Changes to include the conf file
Cleanup