Static analysis code added