Using Pimple idiom, added