Added more authenication