Better sub/superclass organisation