Unbundling plugins; slightly changing validation procedures.