Fixed #73 - Added virtual vendor fields