Added 'final' to classes