Some helper methods have been added