Show Z-wave COMMAND_CLASS under Z-Wave -> Z-Wave Node Management -> Entity Information

Would it be possible to show the command class under Z-Wave -> Z-Wave Node Management -> Entity Information. I have multiple devices that report Energy consumption both as meter and sensor_multilevel and I have to always look in the z-wave xml to get the correct one.
Showing the device endpoint would be great, too.