Builders need to be modified because ControlBuilder is now deprecated