-added Smart Building and Smart Metering