[TASK] Simplify hook subscribers