CSIT-949: Data models