Add needed add-ons refs #4892