add user class, and adjust handler