Data model refactor (with corresponding JOOQ updates), comment
data/domain code