SONAR-5209 Extensions