Re-write quotation methods