Updated validation and fixed vendors routing.