Better ID handling here too