Added universe option to surpress identity conversion.