Added auth flag support