Last changes for app with real backend to work