Updated UserHandler