added separate support for v1