Feature #5740 Refactor new construction for old gui extension