Add Subscriver support
Add test, failing for now