Updated support for PDO