Rework pod-exec and node-exec

Rework pod-exec and node-exec #163