Added realtime feed support
Merge