Got rid of field next in entity.