Few changes to refresh and update data