Update design and stubs with latest