Added controller and batch_system for encapsulation