Adjusted auth flow with handlers