Added V3 class