Change static calls to non static to have ability unit test.
Add wrappers to experts