Return List instead of Collection where appropriate