Added a way to construct units with complex names.