Fork with Contao specific enhancements