Added event subscription for Endpoint class