Also added XML parameter extraction