Added assert to entity fields part 2