Refactoring Classes related to Update data