Started adding better authority detection