More work on PDO convertion