Updated stubs for code refactoring