Added Cilex and Pimple support