adding v7 support