Add multi-issue support