Support for Sonar 3.5.1