Use fork of component-builder