Added more helper methods