There's a rework coming, but don't expect it to come out soon. It's been in the works (the word "work" used quite liberally here) for a long time and there's no ETA on it yet.