Update to a different way of handling plugins