Modern syntax, fix for Carousel data source