Improvements, added token hooks.