Add support for i8