Refactor and add dataset tag to module in yaml description