Create "Bookmark" object in app instead of lib
Update submodule