Updated click templates with the ability to use click sockets instead of ToDevice/FromDevice