Split main trait into facets; it was getting too big
More shuffling around
Facets for insert and update