Major rework - Separated subscriptions, publish and regular events