Added full support for non-metric variables