Added deps and removed dependency on user