add-on improvements