Added mix v1 and v2 support