This may be hard and require some invasive changes, but we should look into this.