UPD: Imporve Auth Library