Switch to margs module/egg