SONARJAVA-9 Improve API