Code refactoring. Added QueryConverter2 to DataStore3 and PostgreSql3