Add Viewport and top-level to user migration