Reintroduced DRY change on table and model behaviors.