Modules update, using instanceof instead of DataUnitType.canBeCast