Added activate/deactivate/updated method names where needed