Changes that includes more useful stubs.