Adding multimodule support