Support for new locking type (move more lock logic to UAE side)