Added in support for current functionality