framework improvements to support new handler