Reorganize collection compatibility checking