Adding Unit Classes

This change adds the remaining unit classes, they will be further
defined later.