Added support for UPS