[Updated to work with new component builder]