Added rest of unit attributes