Added support for login