Add enc_password and name field. More logic