Stub restructuring