Modified version for silex/silex