Made plugins take type into account.