Better jvg support