Renamed methods to more explicit names