Change static call of methods to non static