Refactor, get rid of callStatic