SONAR-5007 improve DAO API