Added static analysis