companion update to workbench IBDBGenerator refactor
Logic error fixes