refactoring for changes in JSeek