Added new fields from QA and sorted