Added matrix fields to the comparison