Converted module to use yogi