MOB-91: Updates to match 2.0.6 API