Added in new functionality to support varience