Added message model, updated event and user properties