This approach was in there before we started using that paradigm. I'll see about refactoring the base class.