Updated OnLoadPlugIn()