Added language independence to several plug ins