Looking forward of this feature to get into WP core