Better parsing and validation of configuration object
Minor changes in configuration