updated for future addon plugins