Minor update
Update for WAF scripts
Refactoring WAF scripts