Added signIn/signUp support