Updated return values for all functions