Updated to match Ilargia changes