I think this can be tackled later as an issue.