Number type suffixes improved