Added extra quote fields to enable frontend saving