Changed subscribe to SaveOrUpdate