Refactored Subscribers