Yes, this should be done. Will add it.