New version of the module (see GenericUVa project for the details).