Added classes for long polling, controller