Some code improvements and Config file added