Added basic-auth and timeout options