Removed code duplication from Workbench\PackageCreator