Review ID-related parts.
Merge pull request #2 from georgebina/master

Review ID-related parts.