Added lock wrapper for storage lock, mactobyte