Making target options ip version aware
Making target options ip version aware