Fix refactoring bug
Adapt examples
Reindex