Updates to MultiModule