improve realtime support