Upgrade app to use REST