Add support for helpers