Completed DynamicTable rewrite