Add pwd support