Refactored subscription
Fixed some annotations