Refactored addon package for simpler usage