CLC-4230 - Don't use AbstractModel