Add lock support