Adding realtime support
Merge branch 'realtime'