Updated for new Chrome extension requirements