Added smart realtime updating