Updated with recent TrinityCore changes