Added asserts on entities fields