Added proxy support and global locations