Adding support for complex and ui bookmarks