Improve harmonization of scale and units
Delineate between Axis<?> and AxisType as much as possible