More module management work.