Refactored to use Pimple
Fixed conflicts with Pimple refactor