[#813] Returning `List` object

* Based on review from @jonase