REF: Add support for I