Adding authentication support