Better handling of PBKDF