Updated handler key