Updated to the new, simplified plugin architecture