JIRA-86: esawyer. Last data model cahnges.