Add infrastructure to cope e.g. with collection renaming.