Update data
Refactoring