Added more issue separation