Updated to work with nondepricated plugin modules.