Commenting to follow this thread, cause I’ve also being trying to find an elegant solution for this problem.