Added types to update messages
Got rid of some nulls