[Updated to work with component builder, the latest]