Support HTTP auth and refactored delegate