Change EventListener functions to non-blocking scope