Updated feature: Added some helpers