Add better mod support