Modified to support the v3 by default