added subscriber related logic