Updated to initialize stubs correctly