Module handling improved.