Added custom helpers support and fixed a few bugs