Getting ready for v2 for manage