Updates

Also added suport for realtime updates