Add context handlers back into plugin script