Update EntityExtract.scala