split out relay/tunnel definition and add warning option