Added block support to helpers