Added field_collection feature for UAT