Introduce addons as replacement of custom vendor