Updated plugins and wrappers