Changed constructor arguments for Units