Added support for no encryption option