Refactored stubs.