Moved to use more of MassiveCore functions