add ID YAMJ handling