Updated return values for class methods