Sounds good. Will you make it an option in this PR?