Properly wrap category response
Toolbox update