Refactoring to use lists as the default result type