UPD: Improve Auth library