Username and password support added