Refactor self activatable command handler
Refactor activatable handler to support multiple activations