Moved data out of stubs