Made some public for OTJ

Updated package for OTJ, made some things public for OTJ needs