Removed Pimple and added custom container