Added more helper methods to each class