Refactoring to utilize Data table changes.