Improved PdoStore a bit