Update to match new component builder API