Added further support for v8