domain model changes to support new, more generic Subscriptions feature, and Search