Refactored actions activation