Split the Bookmark function as independent addon