Configuration management added.