Added handler actiave and deactivate methods