Adapted to reflect changes in the plugins library.