Add additional structure and stubs