Adding authentication to annotations support