Removed dependency on vault