Updating after migrating MarketPlaceBundle into CoreBundle