Adding modular management