New logic

New logic getting the supported language from the data-supported instead.