Add some configuration management