Added support for custom helpers