Some progress on helpers module