updates to data model and renamed the encryption class