Refacatorized $ocspackage