Added multiple module mode