Updates code to match starter-kit-1.0.0-rc.2