Small changes incorporating Collections