Added upgrade classes and units model