First pass at handling differences between v2 & v3