Updated basic auth and mapping