Improved identifier computation