Made return types more specific