Add support for specifying whether we want metric units