Added password support