I will take a look at the latest code on trunk and try to implement the solution for this functionality.