refactoring to bookmarkStore structure