Add username and password support