Updating default field logic to extend more easily to all other contexts