Feature: Improve performance by about 10x by adding dependency of Oj