Added the Unit class