Add code for block unique ID support