Properly implement plan add_on support