Adding Prefixes and Subscriptions handling, plus tests