unitype class replaced with new implementation.