Made some classes final.