Updated to support for commandline configuration