Added final changes to remote data manager