Adding macro selection for protocols