Subscrber moved to separate class