Updated SDK and client app to support latest data model changes