Start refactoring targeting options
Add per-zone targeting configuration