Refactor to list not collection