Updates from Alex and Izzy to use latest AppSDK