Optional dependencies and properly handle mod name conflicts again