Improved taxonomy performance