Added BookmarkService to ease unit testing. Need to refactor the scope function reference