Added support for pre UPS modularization deployment