Custom event add - remove implemented to check for duplicate subscription