Added assert to entity fields part 3