Updated app to work with latest requirements.