Additional PDO implementation improvement