BASE-6004 model updates