Upgrading to SDK v1.9.10 and various model changes