Merge "Migrate get vim_types to new framework"