Updated Drupal and Entity API