Fixing a bad bug and adding "raw" field