Added some helpers