[CORE] Add unique id to block