Added symbols and fixed acquiring tool-name from a struct (instead from a desig)