Added metric system support