Renamed methods to be more generic