No need to hack it, we'll add proper support for this.