Addon section rework