added further IP support