Plugin Changes for hotswapping