Room id and descriptor logic updated