Updated the configuration

added basic validation and more keys