Improved Tool context support