We should wait for HV-1363 Pull Request Sent to be in and maybe even enhance further the work done in it.