add cata changes and add bookmark helper class

Signed-off-by: Hake Huang <hakehuang@gmail.com>