Package refacto & component now dispatch event only if enabled