FELIX-1229 : Add new annotations for activate and deactivate; add enumerations for policy and strategy