Added new units
Added electric charge and duration