Adding authentication support, but currently disabled