Modified content and background scripts to support for new public api