Add functionality for 'S' and 'I'