Improve unit handling for units other than electrical energy