Adding ability to set cipher type