Added tool use and skill-type tags to primitives