Adds Password support