Refactor to use the table object's save method
Merge branch 'framework' into DI-restructure