Update for component-builder v0.8.2