More consistency for id
Add a message for enhancement