Added support for hashed id