Yep, #461 will be great! I will try to review it today... it is a big PR but I think it is a very important feature...