Added early version of tool decoration