Working on new subscription management system