Refactor opf file manipulation to use base class
Refactor opf manipulation