[PATCH 16/16] Split ksdata execute and setup methods for addons