Enhance stuff to add relay shipping mode