added units
fixed incorrect classical inheritance behavior