Added some helpers I've been after