Updated for security implementations.