Make Type and unit processing configurable