Add vendor authentication and fix ambiguous definitiions