Refactoring to Collections is now available!