Making target options ip version aware