add back experimental stuffs since ElementCataloger is using them
currently