Fixed convenience return type implementation