Updated stubs for new code refactoring