Improve custom and example addons