Fixed inherance
Sonar fixes