Adding some 'final's