More ComponentBuilder stuff