Add activate/deactivate methods