new handler support, class specific