Added support for mutli-typed units