Improve auth