Good question. Let's keep this in mind for now  and finish this PR first.