Add support for %i{} and %I{}
Add specs for %i{} and %I{}