Sonar fix: Classes should not be empty