Legacy code removed, implementation to handle new subscription object started
Updated merge conflict