Also add type to drupal layer