Added lock timeout