fix context and add tracking/monitoring .vm