Added email and vendor suppport
Removing config