SONARJAVA-236 Update the implementation to not work on token level