Made classes abstract for sonar cleanup