Add support for volumes in units.py
 Remove units_deprecated.