More refactoring for Protege plugin work