Minor adjustments.
Security configuration.
Fixed configuration to avoid circular reference.