consolidated types into units