Added support for simple UPS