Add proper support for V3