JDF-55 More Sonar rules