[ACC-30] More data model classes