Changes to refresh method
Removing duplicate fields that already show up under common or context