Some more CoreMod Preparation