Added support for unit constraints.