Adding handler classes