Updated support for component-builder v0.7.0