Make some classes final