Base auto-generated add-on