Added field_base and field_instance (http://drupal.org/node/1064472)