OnActivated() and OnDeActivated() now fully supported !