Added to collate field
Minor bug fixes