Update models & views. Need to fix comparator function.