Add support for S8.