Make visualization work with recent refactorings