Changes to helper methods