Updated for component-builder 0.7.0