Edited Units class def