Add gvm support