Replaced PSBlocks and PSItems with PSDatabase