Added user agent support