Refactor for Data table changes