Adding changes for Basic Auth