*8148* refactor for base class, app-specific imports