Microsoft’s upcoming Photos app will now have some intelligent image-sorting. With AI image search to spot and classify objects, the images can be scanned to identify and catalog photos. Windows Central reports that the Photos app will filter photos by colors, objects, faces, months they were taken, and other categories.

A cloud-based image recognition algorithm will sort and select photos from the photo collection. The first time it is used, Microsoft Photos will index all the images taking about a second per image for processing. Once the indexing is done, the items can be searched and sorted quickly. Microsoft Photos, much like Google Photos, will suggest albums and allow you to keep these photos shot around the same place and time in a similar theme.

The app has been released only to the Windows Insider Release Preview Ring and is expected to be added to the Fall Creators Update due this year in the fall.