Add additional header checks