WB-105: Update domain model