[EVENTRIC-47] Refactor subscribe functionality