Changes for Chrome plugin