Expanding on encryption class