Removed get_raw redundency in ContentGenerator and fixed a few bugs