Added bookmarks to API and cleaned up some parts of HTTP class.