Added support for helpers