Ensure models align correctly in federation