#1109 - Add support for extension handler pattern.