Added base for addons