Update implementation of SA1000 to use the new token analysis functionality