Refactor web app to new API convensions