Refactor consumer-mod