Login API + Other changes