Adding v6 comatibility