added units to classes