Not working commit. Adjustments for contao3