Changed key derivation to PKDF2