Strengthen handler references