Put Collection List in its own class