Changed: minor improvements to SetupFactory/Legacy