This is exactly what i propose in many of my threads such as here, support those(or similar) changes then