Refactoring in DynamicTable