Added parallel locking