diff --git a/cod_session_evaluations/cod_session_evaluations.features.field.inc b/cod_session_evaluations/cod_session_evaluations.features.field.inc
index 058c466..f2b85c5 100644
--- a/cod_session_evaluations/cod_session_evaluations.features.field.inc
+++ b/cod_session_evaluations/cod_session_evaluations.features.field.inc
@@ -10,7 +10,7 @@
 function cod_session_evaluations_field_default_fields() {
   $fields = array();
 
-  // Exported field: 'node-session_evaluation-body'
+  // Exported field: 'node-session_evaluation-body'.
   $fields['node-session_evaluation-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -36,6 +36,7 @@ function cod_session_evaluations_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -99,7 +100,7 @@ function cod_session_evaluations_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-session_evaluation-field_eval_session'
+  // Exported field: 'node-session_evaluation-field_eval_session'.
   $fields['node-session_evaluation-field_eval_session'] = array(
     'field_config' => array(
       'active' => '1',
@@ -110,40 +111,37 @@ function cod_session_evaluations_field_default_fields() {
       'field_permissions' => array(
         'type' => '0',
       ),
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
-          ),
-          'table' => 'node',
-        ),
-      ),
+      'foreign keys' => array(),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
-      'module' => 'node_reference',
+      'locked' => '0',
+      'module' => 'entityreference',
       'settings' => array(
-        'referenceable_types' => array(
-          'article' => 0,
-          'bof_session' => 0,
-          'page' => 0,
-          'room' => 0,
-          'schedule_item' => 0,
-          'session' => 'session',
-          'session_evaluation' => 0,
-          'time_slot' => 0,
-          'webform' => 0,
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+        'handler' => 'base',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 0,
+            ),
+          ),
+          'sort' => array(
+            'direction' => 'ASC',
+            'field' => 'body:value',
+            'property' => 'nid',
+            'type' => 'none',
+          ),
+          'target_bundles' => array(
+            'session' => 'session',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
       'translatable' => '0',
-      'type' => 'node_reference',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'session_evaluation',
@@ -153,17 +151,13 @@ function cod_session_evaluations_field_default_fields() {
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
           'weight' => 1,
         ),
-        'ical' => array(
-          'label' => 'above',
-          'settings' => array(),
-          'type' => 'hidden',
-          'weight' => 0,
-        ),
         'teaser' => array(
           'label' => 'above',
           'settings' => array(),
@@ -174,26 +168,19 @@ function cod_session_evaluations_field_default_fields() {
       'entity_type' => 'node',
       'field_name' => 'field_eval_session',
       'label' => 'Session being evaluated',
-      'required' => 1,
+      'required' => 0,
       'settings' => array(
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'nodereference_url',
+        'module' => 'entityreference',
         'settings' => array(
-          'autocomplete_match' => 'contains',
-          'edit_fallback' => 0,
-          'fallback' => 'select',
-          'node_link' => array(
-            'destination' => 'source',
-            'full' => 1,
-            'hover_title' => 'Fill out a short survey about this session',
-            'teaser' => 0,
-            'title' => 'Provide feedback on this session',
-          ),
+          'match_operator' => 'CONTAINS',
+          'path' => '',
+          'size' => '60',
         ),
-        'type' => 'nodereference_url',
+        'type' => 'entityreference_autocomplete',
         'weight' => '-3',
       ),
     ),
diff --git a/cod_session_evaluations/cod_session_evaluations.info b/cod_session_evaluations/cod_session_evaluations.info
index 9f1fa18..3a82d2a 100644
--- a/cod_session_evaluations/cod_session_evaluations.info
+++ b/cod_session_evaluations/cod_session_evaluations.info
@@ -1,31 +1,33 @@
-name = "COD Session Evaluations"
-description = "Allow users to provide feedback about sessions"
-core = "7.x"
-package = "COD"
-version = "7.x-1.0-alpha1"
-project = "cod_session_evaluations"
-dependencies[] = "cod_session"
-dependencies[] = "content_access"
-dependencies[] = "features"
-dependencies[] = "node_reference"
-dependencies[] = "nodereference_url"
-dependencies[] = "strongarm"
-features[ctools][] = "strongarm:strongarm:1"
-features[field][] = "node-session_evaluation-body"
-features[field][] = "node-session_evaluation-field_eval_session"
-features[node][] = "session_evaluation"
-features[variable][] = "ant_pattern_session_evaluation"
-features[variable][] = "ant_session_evaluation"
-features[variable][] = "cod_unique_session_evaluation"
-features[variable][] = "comment_anonymous_session_evaluation"
-features[variable][] = "comment_default_mode_session_evaluation"
-features[variable][] = "comment_default_per_page_session_evaluation"
-features[variable][] = "comment_form_location_session_evaluation"
-features[variable][] = "comment_preview_session_evaluation"
-features[variable][] = "comment_session_evaluation"
-features[variable][] = "comment_subject_field_session_evaluation"
-features[variable][] = "menu_options_session_evaluation"
-features[variable][] = "menu_parent_session_evaluation"
-features[variable][] = "node_options_session_evaluation"
-features[variable][] = "node_preview_session_evaluation"
-features[variable][] = "node_submitted_session_evaluation"
+name = COD Session Evaluations
+description = Allow users to provide feedback about sessions
+core = 7.x
+package = COD
+php = 5.2.4
+version = 7.x-1.0-alpha1
+project = cod_session_evaluations
+dependencies[] = cod_session
+dependencies[] = content_access
+dependencies[] = entityreference
+dependencies[] = features
+dependencies[] = strongarm
+features[ctools][] = strongarm:strongarm:1
+features[features_api][] = api:1
+features[field][] = node-session_evaluation-body
+features[field][] = node-session_evaluation-field_eval_session
+features[node][] = session_evaluation
+features[variable][] = ant_pattern_session_evaluation
+features[variable][] = ant_session_evaluation
+features[variable][] = cod_unique_session_evaluation
+features[variable][] = comment_anonymous_session_evaluation
+features[variable][] = comment_default_mode_session_evaluation
+features[variable][] = comment_default_per_page_session_evaluation
+features[variable][] = comment_form_location_session_evaluation
+features[variable][] = comment_preview_session_evaluation
+features[variable][] = comment_session_evaluation
+features[variable][] = comment_subject_field_session_evaluation
+features[variable][] = field_bundle_settings_node__session_evaluation
+features[variable][] = menu_options_session_evaluation
+features[variable][] = menu_parent_session_evaluation
+features[variable][] = node_options_session_evaluation
+features[variable][] = node_preview_session_evaluation
+features[variable][] = node_submitted_session_evaluation
diff --git a/cod_session_evaluations/cod_session_evaluations.strongarm.inc b/cod_session_evaluations/cod_session_evaluations.strongarm.inc
index 75046a1..96c6fcc 100644
--- a/cod_session_evaluations/cod_session_evaluations.strongarm.inc
+++ b/cod_session_evaluations/cod_session_evaluations.strongarm.inc
@@ -10,77 +10,94 @@
 function cod_session_evaluations_strongarm() {
   $export = array();
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'ant_pattern_session_evaluation';
   $strongarm->value = '[current-user:name]\'s evaluation of [node:field_eval_session]';
   $export['ant_pattern_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'ant_session_evaluation';
   $strongarm->value = '1';
   $export['ant_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'cod_unique_session_evaluation';
   $strongarm->value = 'single';
   $export['cod_unique_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_anonymous_session_evaluation';
   $strongarm->value = 0;
   $export['comment_anonymous_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_mode_session_evaluation';
   $strongarm->value = 1;
   $export['comment_default_mode_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_per_page_session_evaluation';
   $strongarm->value = '50';
   $export['comment_default_per_page_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_form_location_session_evaluation';
   $strongarm->value = 1;
   $export['comment_form_location_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_preview_session_evaluation';
   $strongarm->value = '1';
   $export['comment_preview_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_session_evaluation';
   $strongarm->value = '2';
   $export['comment_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_subject_field_session_evaluation';
   $strongarm->value = 1;
   $export['comment_subject_field_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'field_bundle_settings_node__session_evaluation';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '-5',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__session_evaluation'] = $strongarm;
+
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_options_session_evaluation';
@@ -89,14 +106,14 @@ function cod_session_evaluations_strongarm() {
   );
   $export['menu_options_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_parent_session_evaluation';
   $strongarm->value = 'main-menu:0';
   $export['menu_parent_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_options_session_evaluation';
@@ -106,14 +123,14 @@ function cod_session_evaluations_strongarm() {
   );
   $export['node_options_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_preview_session_evaluation';
   $strongarm->value = '1';
   $export['node_preview_session_evaluation'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_submitted_session_evaluation';
