Consolidate issue tracking