Add Unit model, and add changes