Added wrapper for configuration mgmt.
Cleanup