Expanded the Unit class