Adding Unit Type functionality