First commit of configuration management. references #409