Refactor Visualization::Collection