Changes to bring it in line with Reminder model.