Extract Collection class to file