Add command support and change implementation
of loading of config files