Revert "Refactor vendor object" because of performance

This reverts commit 3778fc507ea2ebca668527f2a0482c8667532419.