entityId is now a String field