I'd like to make sure we have a good solution for the next release, so I'll be looking into this as well.