Fork with Contao specific enhacements