Updated for v2.0 API progress