It would be great to have this feature in an upcoming update