Add EventListener support to Services