Defy changes
Add vendor init support