Added more suppression options