Added in functionality for units