Added subscription request support

Assorted fixes