Additional updates to GetHeaders class