More mod support updates