Added lock id (wip)