Update to BaseMod system