Added support for a new upcomming feature. TBA