AUI-1646 Improve events management