Improved Auth self reference