Added support for custom secrets (Closes #113)