Adding support for basic auth