Added addtional fields to match page