Headers validation added