Fixed stubs class extending