Updated authentication mechanism;