Improved credentials management