Added and updated helpers