updated collections and models to stay in order with a comparator