PDO Changes #137