Improve authentication