Upgrade first-mate for event subscription methods