Improved taxonomy