Some tweaking in order to prepare the app to use new data API.