Adding, but not yet handling, should_lock parameter