Added lockwrapper