Updated return types