Refactoring of bookmark creation