Added initial implementations for activate/deactivate