'I' modifier support - WIP