Add factory, controller for high-level goals