If you wait for the next release there will be a better way to do this.