DataSouce refactoring for PDO support