Edit codes for sync with new CheeModule