Simpler persistence

Dedenormalize database representation of data.