added hardware and software tags