WIP: Added block support to helpers