Changed ControlBuilderRegistry internal store to array