Enhance:enhance structure of toolbox