Updating to include oj.Table