Add support for other units.