Added password/encryption