Addition of activation/deactivation hook methods