Added Ids. Better logging