Border and Metric primitives added