Auth 2.0 modification