Update to match new component builder api