Added inline notifications and reference ids