Added attach-handle-values functionality