We should check this with @decanio which has by the way a similar feature waiting.