Added suport for outlock