Adding more class stubs