Moving functions into a common class
Updating vendors