SONARJAVA-801 Improve implementation