As suggested switch to pimple 2, closes #762