Subscription model + fix uniqueness constraints