Adding long polling support for vendors