Copy starter-kit-defuns from v2